let's darken colors, not lighten them.

2001-02-08  Havoc Pennington  <hp@redhat.com>

	* gtk/gtkstyle.c (get_darkened_gc): let's darken colors, not
	lighten them.

diff --git a/ChangeLog b/ChangeLog
index 7404d8f92588c99d95b5ff762e1c92938e8f82dc..dd091e1c7257242d9263a53a1a2f2828e2812251 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-08  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkstyle.c (get_darkened_gc): let's darken colors, not
+       lighten them.
+
 2001-02-08  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_destroy_layout): remove

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7404d8f92588c99d95b5ff762e1c92938e8f82dc..dd091e1c7257242d9263a53a1a2f2828e2812251 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-02-08  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkstyle.c (get_darkened_gc): let's darken colors, not
+       lighten them.
+
 2001-02-08  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_destroy_layout): remove

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7404d8f92588c99d95b5ff762e1c92938e8f82dc..dd091e1c7257242d9263a53a1a2f2828e2812251 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-02-08  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkstyle.c (get_darkened_gc): let's darken colors, not
+       lighten them.
+
 2001-02-08  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_destroy_layout): remove

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7404d8f92588c99d95b5ff762e1c92938e8f82dc..dd091e1c7257242d9263a53a1a2f2828e2812251 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-02-08  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkstyle.c (get_darkened_gc): let's darken colors, not
+       lighten them.
+
 2001-02-08  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_destroy_layout): remove

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7404d8f92588c99d95b5ff762e1c92938e8f82dc..dd091e1c7257242d9263a53a1a2f2828e2812251 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-02-08  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkstyle.c (get_darkened_gc): let's darken colors, not
+       lighten them.
+
 2001-02-08  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_destroy_layout): remove

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7404d8f92588c99d95b5ff762e1c92938e8f82dc..dd091e1c7257242d9263a53a1a2f2828e2812251 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-02-08  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkstyle.c (get_darkened_gc): let's darken colors, not
+       lighten them.
+
 2001-02-08  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_destroy_layout): remove

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7404d8f92588c99d95b5ff762e1c92938e8f82dc..dd091e1c7257242d9263a53a1a2f2828e2812251 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-02-08  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtkstyle.c (get_darkened_gc): let's darken colors, not
+       lighten them.
+
 2001-02-08  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_destroy_layout): remove

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 7b6c04e01b478a75f077e5d3ab5c4af426bc57b2..0c00b3e30d7f655ea7619a7472da12696972edf0 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -2429,7 +2429,7 @@ get_darkened_gc (GdkWindow *window,
 
   while (darken_count)
     {
-      gtk_style_shade (&src, &shaded, 1.3);
+      gtk_style_shade (&src, &shaded, 0.93);
       src = shaded;
       --darken_count;
     }

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index b30eeefb139f936038b7e6f643cdc3f02e394373..b5cdbef1e2d46e4c5c8edb3b0d06de886de39f8c 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1109,7 +1109,6 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
           /* FIXME when we have style properties, clean this up.
            */
 
-#if 1
           if (tree_view->priv->has_rules)
             {
               if (flags & GTK_CELL_RENDERER_SORTED)
@@ -1146,7 +1145,6 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
             }
 
           g_assert (detail);
-#endif
           
           /* Draw background */
           gtk_paint_flat_box (widget->style,